From 1480ca6c7dbab2a60be5d92764b40247d72d4b04 Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Mon, 29 Sep 2014 03:00:51 +0000
Subject: [PATCH] Leak fix during tension of object being both a class and a
 global...

---
 gpsbabel/csv_util.cc       | 2 +-
 gpsbabel/g7towin.cc        | 2 --
 gpsbabel/xcsv_tokens.gperf | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/gpsbabel/csv_util.cc b/gpsbabel/csv_util.cc
index 9915f9b6e..b7c39e035 100644
--- a/gpsbabel/csv_util.cc
+++ b/gpsbabel/csv_util.cc
@@ -754,7 +754,7 @@ void xcsv_file_init(void)
 }
 
 XcsvFile::XcsvFile() {
-   xcsv_file_init(); 
+//   xcsv_file_init(); 
 }
 
 void validate_fieldmap(field_map_t* fmp, bool is_output) {
diff --git a/gpsbabel/g7towin.cc b/gpsbabel/g7towin.cc
index e2f13e263..7df56a125 100644
--- a/gpsbabel/g7towin.cc
+++ b/gpsbabel/g7towin.cc
@@ -410,7 +410,6 @@ data_read(void)
   char* buff;
   int line = 0;
   Waypoint* wpt = NULL;
-  Waypoint* prev = NULL;
   route_head* head = NULL;
 
   while ((buff = gbfgetstr(fin))) {
@@ -483,7 +482,6 @@ data_read(void)
     case 'P': /* proximity waypoint */
     case 'W': /* normal waypoint */
       wpt = parse_waypt(cin + 3);
-      prev = wpt;
       if (wpt) {
         if (mode == rtedata) {
           route_add_wpt(head, wpt);
diff --git a/gpsbabel/xcsv_tokens.gperf b/gpsbabel/xcsv_tokens.gperf
index b650d5b75..c57b0edb1 100644
--- a/gpsbabel/xcsv_tokens.gperf
+++ b/gpsbabel/xcsv_tokens.gperf
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0.3 */
+/* ANSI-C code produced by gperf version 3.0.4 */
 /* Command-line: gperf --output-file=xcsv_tokens.gperf -L ANSI-C -D -t xcsv_tokens.in  */
 /* Computed positions: -k'2,4-5,12,$' */
 
@@ -107,7 +107,7 @@ hash (register const char *str, register unsigned int len)
 
 #ifdef __GNUC__
 __inline
-#ifdef __GNUC_STDC_INLINE__
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
 __attribute__ ((__gnu_inline__))
 #endif
 #endif
-- 
2.30.2